Skip to content

Switch Jenkins image tracking to registry tag due to Samples Operator… … deprecation #1151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

ravanelli
Copy link
Member

Added jenkins-stg-agent-base.yaml to work around limitations in the Staging environment. Also updated documentation to note the unreliability of the Staging registry and instructed users to use their own agent image.

@ravanelli ravanelli changed the title manifest: add jenkins-stg-agent-base.yaml due to staging limitations Switch Jenkins image tracking to registry tag due to Samples Operator… … deprecation May 16, 2025
@ravanelli ravanelli force-pushed the pr/fix_stg branch 2 times, most recently from 2ea2426 to 6af98f5 Compare May 16, 2025 21:31
Copy link
Member

@dustymabe dustymabe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

haven't fully looked through everything yet, but wanted to put a few comments out there for discussion

@ravanelli ravanelli force-pushed the pr/fix_stg branch 2 times, most recently from 41d0ed5 to 6cb26c3 Compare May 20, 2025 18:59
@ravanelli ravanelli requested review from dustymabe and jlebon May 20, 2025 19:59
Comment on lines +22 to +24
kind: ImageStream
metadata:
name: jenkins
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now we have two imagestreams named jenkins. The other one is on line 50 of jenkins-s2i.yaml. I think one of them has to go.

Copy link
Member Author

@ravanelli ravanelli May 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 2 are different, one defines the buildconfig to add our plugins and so on, and the other basically defines the DeploymentConfig. I think make sense to keep it as it is.

Copy link
Member

@dustymabe dustymabe May 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm pretty sure we can't define two image streams in the same namespace with the same name :).

Previously we had the one in jenkins-s2i.yaml because we needed the output from our buildconfig to go somewhere and a jenkins imagestream in our own namespace was where we wanted it to go, so we had to define a jenkins imagestream in our own namespace.

Now we are already defining a jenkins imagestream in our own namespace here in jenkins-images.yaml (previously we were pulling from the jenkins imagestream in the openshift namespace).

So.. we are already defining the jenkins imagestream here in our namespace, we don't need to define it again. The buildconfigs will just output to this imagestream on the :withcert or :latest tags.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aaa never mind, I got it wrong. I was thinking about jenkins.yaml and jenkins-s2i.yaml. Got it now, thanks for the exaplanation

@ravanelli ravanelli force-pushed the pr/fix_stg branch 2 times, most recently from 5cfc40b to 54b9c11 Compare May 22, 2025 14:22
Comment on lines 23 to 27
RUN if grep 'dummy' /etc/pki/ca-trust/source/anchors/root-ca.crt; then \
rm /etc/pki/ca-trust/source/anchors/root-ca.crt; \
else \
update-ca-trust; \
fi
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you try the EOF ? I know it works in newer podman build, but maybe OpenShift builds it doesn't work yet?

RUN <<EOF
    if
    else
    fi
EOF

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it doesn't seem to work

Copy link
Member

@dustymabe dustymabe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking really good Renata. A few comments. We're really close!

ravanelli added 2 commits May 22, 2025 13:52
… deprecation

Starting with OpenShift 4.13, the Cluster Samples Operator has been
downsized and no longer provides updates for non-S2I images like
Jenkins. The `latest` tracked tag was pointing to an image that hadn't been
updated in over two years. This commit updates the image reference to
follow the specific registry tag directly
(registry.redhat.io/ocp-tools-4/jenkins-rhel9:v4.17.0), ensuring we get
the latest maintained version going forward.

To archive this we need to create our own ImageStreams for both the
Jenkins base image and the Jenkins agent image, replacing the deprecated
Samples Operator content.

Signed-off-by: Renata Ravanelli <rravanel@redhat.com>
 - Update documentation to reflect changes
 - Add note about how to work with the Fedora
Staging pipecfg.

Signed-off-by: Renata Ravanelli <rravanel@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants